Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <[email protected]>
Sat, 9 Aug 2014 14:48:34 +0000 (16:48 +0200)
committerAlbert ARIBAUD <[email protected]>
Sat, 9 Aug 2014 14:48:34 +0000 (16:48 +0200)

Trivial merge